Merge "Revert "[RESTRICT AUTOMERGE] CTS test for Android Security b/34897036"" into oc-dev am: c25c3764 am: 1bc692c0 Change-Id: I75f63c1bfe028027f39ae4622583878c47d67fc9