Merge "Merge "DO NOT MERGE: CTS test for Android Security b/34749392" into nyc-mr2-dev am: 88d5cad539  -s ours am: c889e797c6 am: 408fcba723 am: 1923f3d8f4  -s ours"
am: 6ce85daa11  -s ours

Change-Id: I8540252f720c5a5b36ed4510f3b4484e0da26910