Merge "Merge "Add flag to AMS.startInstrumentation() to disable hidden API checks" am: 4a8fa52e4b am: b459c66fca am: 7bfadcb095  -s ours"