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

Bug: 135460123
Change-Id: Id717354dc93795e904588023b6e79d2ccd1ba2e0
Merged-In: Idf5a1366c365b45a542eb63e110f32c5c1a662ce