Merge "Disable adb root for CtsOsHostTest#testNonExportedActivities" into pie-cts-dev am: 3c571f8c90 am: e4dc8cdb23
am: 9b030ff848

Change-Id: I03d6897bd7de99de54a00bdae68437d6c6283771