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

Bug: 135460123
Change-Id: I2fb9c8f2a087158bf077dcdecad492a781415ea3
Merged-In: Icfe61f4ce95a4299bb6056069fc5b8ce96ec62b8