Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/29982686" into oc-dev am: 7552ad0aa7
am: e940ed5ba1

Change-Id: Idd6057955a2fb457ed0f68731513875125828af4