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

No content change.

Bug: 135460123
Change-Id: I43ae9d09d8b2b27445a09f94411c6252bf6e0107
Merged-In: Iaeb61121f5854bbbc7f762e131be1c1c27d14331