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

Bug: 135460123
Change-Id: I1603d3021b1441e6663328c53e18b61966b35070
Merged-In: I6b0da2402fd6907ea87caca37b5f9f11e06d2586