Merge "Merge "Test: Change way to find app in TV launcher" into oc-dev am:...
Merge "Merge "Test: Change way to find app in TV launcher" into oc-dev am: 74f3ab58 am: 257e0e06" into oc-dr1-dev-plus-aosp
am: 546818ec
Change-Id: Ic8f0c8a6287167d45628cd85d69b8be89a3f6f75