[automerger skipped] Merge "[RESTRICT AUTOMERGE] CTS test for Android Security b/112662184" into pi-dev am: 39f9eb43 -s ours am: 12897959 Change-Id: If59c0fd64b860c4adbcc5af7a11fb002efb3d43f