Android 10.0.0 Release 17 (QP1A.191005.007.A3)
Merge cherrypicks of [9310549, 9311516] into qt-release

Change-Id: Idf9e7ef64c9d19b39c39858678247c00d7c3443d