[automerger skipped] Revert "[RESTRICT AUTOMERGE] Updated CTS for Android Security b/71375536" am: 9c92fa8c06 am: d9eeb9e0c2 -s ours am: 8d88dfda79 -s ours am: ce56f6595f -s ours am: afe84db29c

Change-Id: I60b71c6053a0ad46125ac0458c27f843fd7d4ee7