Merge "[RESTRICT AUTOMERGE] CTS test for Android Security b/63521984" into oc-dev am: faca283e40 am: 5fba1705d4

Change-Id: I2f6d4bcf17c990a463c5c2f33afb4b468edb721f