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

No content change.

Bug: 135460123
Change-Id: I90ce815c3eb5d438b40d2a7186eacf7d36da9569
Merged-In: I12c299b18f26a6135dc8573693318679f443b5df