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

No content change.

Bug: 135460123
Change-Id: I9ced2840229e5f86c569d1465a71e536f6eeddbe
Merged-In: I544182ded73bb332d8b6277c02e854a4bcd9e1a6