Merge "Fix CTS UiAutomationTest#testAdoptSomeShellPermissions" into rvc-dev