Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

No content change.

Bug: 135460123
Change-Id: Ie678344d76bd09ae7e96a1cd16c4b2f567bb8945
Merged-In: I42a9409f1842370a61c0065c889f74cca9313a70