Merge "[automerger] Revert "CTS test for Android Security Bug-138441919" am: ce64b52706 am: 7942be67dd am: 73d3427fe9 am: 6ab9ecdedc am: 2bab7562af am: 0cd91fced2 am: f5dbc9e840 am: db7f6ccf8e am: 749c4046d7 am: 1392e912cb" into qt-qpr1-dev-plus-aosp
am: 574c61a3e2

Change-Id: I21867da66f6a5cfe9925bb152d9ea09c9424af98