Merge "Merge "CTS test for Android Security b/33940449" into oc-dev am: 9fcaa3c943 am: 15bee1b60a am: 68e514d511"
am: 716c549589

Change-Id: Ic997018326c71556a5fad9703cf6973fd59d20e5