[automerger] Merge "CTS test for Android Security b/68160703" into nyc-dev am: 46ce2e0133 am: 35065c471b

Change-Id: I40343bc4be23deaf11cb163a21fe262f55d30751