Merge "CTS test for Android Security b/37712181" into oc-dev
am: 3da8050263

Change-Id: Id1f4816443238103224eb64013930c72ad1a0406