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

No content change.

Bug: 135460123
Change-Id: Ib2d44961b7fe9e55baa564629dc5ff1f7b6dfade
Merged-In: I7f92dfad9cb6bb2a5f618a9302d511891b0112be