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

Bug: 135460123
Change-Id: I92d523c35ffd18f3eff538b721fdc7ffa2ddfd1f
Merged-In: I77aa6d15a81bd63bfdb03a36ef73c9bf8a148cbb