Merge "Fix CTS UiAutomationTest#testAdoptSomeShellPermissions" into rvc-dev am: 377e812389

Change-Id: I669d9b0a59efc81fa1b74e3036d837545aa773ab