Merge "Merge "Disable adb root for CtsOsHostTest#testNonExportedActivities" into pie-cts-dev am: 3c571f8c"