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

No content change.

Bug: 135460123
Change-Id: I67771f4bc7a1fa5a448da1a1c9f7f28a8a4b72f5
Merged-In: I74e378c19586cb1d32088a8444f47595ad0ecdd7