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

No content change.

Bug: 135460123
Change-Id: I553695db95a75e3c9a00aab5d41b45c6a5e92db6
Merged-In: I64a01331273216829533f69f4422036e5598a547