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

No content change.

Bug: 135460123
Change-Id: Iea0f26e243a0ac792868a69b321849a3b9cc6773
Merged-In: Ife0f708744ff9b2efdf900b9b5d58555f1487a11
tree: 7e5d6490153e12fcb07779443f3345a2ebda99c8
  1. vrcore/