Merge "Fix CTS UiAutomationTest#testAdoptSomeShellPermissions" into rvc-dev am: 377e8123 am: 41af55df Change-Id: I55c38b2d928f9a5b9cccea2ddf0ec120c5eb6ce9