Merge "Fixing PermissionHostTest CTS tests on TV" into oc-dev
am: 734cbfc4c5

Change-Id: I66d36b63bd212ec11ed9cb9a0cc0c7eefe8d35ed