[automerger] CTS test for Android Security b/24157524 am: 487211c99c am: b349c2a2b0

Change-Id: Iea6e8aed6527d18ac19fec81e743fea8daaee34e