Merge "CTS test for Android Security b/129561406" into oc-dev
am: 8d1cdabf37

Change-Id: Ieca868695007c9af47ce72611c491c508f28f0f4