Merge "CTS test for Android Security b/72460312 b/35258579" into oc-dev am: 68e178e580
am: 42f9d12848

Change-Id: I4e40e409538d2f01dd3b18410eeee5234c46838b