Android CTS 10.0 Release 12 (8504422)
Snap for 5663820 from dbed8732b6194cd90296a6981129fc7d03f54199 to qt-release

Change-Id: I48aa8780fb30306196a4d25306c34284f297845f