Revert "[RESTRICT AUTOMERGE] CTS test for Android Security b/112005441" am: 5d583f0760

Change-Id: I1392315bc2b944d21daf76db8f843a07f72729ff