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

No content change.

Bug: 135460123
Change-Id: Id2a8567a1dade33405d58023f6f7aa94a5a336bb
Merged-In: I261c69b9f179a03c1058dfa7f6d37f78203f8d99