Merge "Fix CtsTvTestCases caused by permissions" into stage-aosp-sc-ts-dev am: 0a375bf1a0 am: 5030ee4918 am: 066dacb9d0

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/15675645

Change-Id: I6008f9dd1fc40c8fcfddbfebe837b86cdb7a7a31