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

No content change.

Bug: 135460123
Change-Id: I69be5471aad3876096fce04b26d64bc9f139342b
Merged-In: I337a9c213062582ded264ab24eb7e8e306e16206