Merge "[automerger skipped] Merge "Backporting the change of ag/15629060 to qt-dev" into qt-dev am: 587162dfb8 am: 37d7f20996 am: 646b7c72ef am: b5edea8384 -s ours am: 34b0222470 -s ours am: 5f7004484d -s ours am: 5c57209810 -s ours" into sc-v2-dev-plus-aosp