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

No content change.

Bug: 135460123
Change-Id: Ic6f8f1bca2824e4331f9965c1d78175fa3d95424
Merged-In: Ief4b64d793b60ab00f57b31f3a80ae388227f7a2