Merge "Merge cherrypicks of [9399564, 9400400, 9399396, 9399397, 9400257] into qt-release am: 5960d27c44" into android10-gsi