Android CTS 10.0 Release 12 (8504422)
Snap for 5333170 from f1f1cbc054db7021d4167a96b55783e087e1b7b4 to qt-release

Change-Id: Idb6c7a299b233ac04a2152a9047fd3ed4244e1c1