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

No content change.

Bug: 135460123
Change-Id: I6c63705611bac56c270318252a52b63b6bde02fb
Merged-In: I2f0d11636620f686f4cbd98ce1d6387fa93377c9