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

Change-Id: I56e28224dac53ef1c8bac7ac15844384eb8fd44c