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