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

No content change.

Bug: 135460123
Change-Id: I8939a8314ae39c281b4ff60e735ed8804c28c635
Merged-In: I349ca268adb9e106947b0b8be55bcd729e7accb0