Android CTS 10.0 Release 4 (6482717)
Snap for 5335706 from 4d151d9e70555f617bd5c8859d9b3857be31fde3 to qt-release

Change-Id: I7960803ec71a70d3bbc059e33fb1acbe5d247b8e