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

No content change.

Bug: 135460123
Change-Id: If8f39f54c4463c338a55ab8437cc117d01149d37
Merged-In: I3d73bf43d8985be0683859900ce9ffec0eb7a27f