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