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

No content change.

Bug: 135460123
Change-Id: I4996b9922f2f8079fd466e378bcb074405920cd9
Merged-In: I345a581282c3c24facefef95df3d57e898783b31