Android mainline 10.0.0 release 3
Merge cherrypicks of [8679266, 8679267, 8679268] into qt-aml-release

Change-Id: I22eb123fe9a77e665a028a4d3a27c0436ab8f4e8