[automerger] Merge "RESTRICT AUTOMERGE: CTS test for Android Security b/32660278" into nyc-dev am: 79d80825 am: b2ca2679 Change-Id: I3079dff712304c52745dfd0ff5a4eb8f02a4e7f6