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

No content change.

Bug: 135460123
Change-Id: Ia45bb3f56097f85a9f262349df2165736e52624c
Merged-In: I2bdaf1520b9e5ad8a4a8ed2f5b0bf3d8c33f083f