Android CTS 10.0 Release 12 (8504422)
Snap for 5434517 from 14be2d1fcb097b45f50d14085a032f1d34d62a7b to qt-release

Change-Id: I7b36d05f0466f214335ce62e0d5578082aabe533