Merge "CTS test for Android Security b/71389378 b/74612050" into oc-dev am: 8e3d59f8d7 am: 377faf9b5a
am: d026632050

Change-Id: I21851eb0890077ba703c8cd7dee585848eaebd5f