Merge "Fix CTS UiAutomationTest#testAdoptSomeShellPermissions" into rvc-dev am: 377e8123 am: 185213a7 Change-Id: Ib846397051999be22669456fb228aad551ed2162