Merge "Merge "DO NOT MERGE: CTS test for Android Security b/34705519" into nyc-mr2-dev am: 72e2966423  -s ours am: 5406a4eb5b am: 5d048cad4c am: a79206cee8  -s ours" am: f1c4922c5c  -s ours
am: 2b500bf0ae

Change-Id: I726752bcda24d8cf3a8123995bf58c98db838271