[automerger] CTS Test for Android Security b/35443725 b/72385804 am: fd68e9ec04 am: 3bfb74e938

Change-Id: Iafdecae038504b5584625acb9f20e14e2d7e5830