Merge "CTS test for Android Security b/65853158 b/72396737" into oc-dev
am: 7298250ea2

Change-Id: I89d8177cb63f88d95ac6df887124280d02d1ad23