Merge "CTS test for Android Security b/72507870 b/28740702" into oc-dev am: 72018c9244
am: 2f83735418

Change-Id: I8494cc9a478bb9fede61078015b8463712decc0a