Android CTS 10.0 Release 12 (8504422)
Snap for 5605988 from 5b431733e99ed35c7a6f70fa64ba6c53d8b01ad2 to qt-release

Change-Id: I367b7f57c7a0686ca878f056f2bf0965a5a28b5b