Android CTS 10.0 Release 16 (9712475)
Snap for 5333170 from 89a8fe6ab75db54c27ab073acda54b57b3a1187b to qt-release

Change-Id: I7d2f0cd2fcc5043bce50dd0c11b86375f4541161