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

No content change.

Bug: 135460123
Change-Id: I98556fee4ae8e9c512e7b1e9a4c19408f34c7658
Merged-In: Ie5129af19ac790185b7cd6cb59f952244d40832b