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

No content change.

Bug: 135460123
Change-Id: Ie284801096463766b8af2e7623029236461b0fe9
Merged-In: I8c96c0c822f50b12b9f703bef0e64142e3b14bc8