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

No content change.

Bug: 135460123
Change-Id: I6950bf5317c1cda08f508a9dfb93b75f7076df43
Merged-In: I48461c06d1ed34045ef251b647cf193c602b4780