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