Merge "CTS Test for Android Security b/72461571 b/32813456" into oc-dev am: 7cce52eefc am: fcadca9319
am: ceb75fde02

Change-Id: I61d8b84a881d5cfdde5150206cd46c3c91c7c854