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

No content change.

Bug: 135460123
Change-Id: I940d6ac1e479efeb24aab9055b89af02564822db
Merged-In: I29b3e3131804fcbc215e0adcbc5dc9cc0a77d220