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

Bug: 135460123
Change-Id: I3f1b333ed770f59da68bbef07543dc95519a7560
Merged-In: I201f79c31638100197e93392b2404efcb68eaace