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

No content change.

Bug: 135460123
Change-Id: Ie2aeeed4fe36d22af07475ee3f1699ff041a76fd
Merged-In: Ia37a39990f81e2b8965952c98a2538a3ac377259