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

Bug: 135460123
Change-Id: Ib240dbbbde77d0bd1c86753f68a2254728073510
Merged-In: I20eda906f06b84b148b1b94439e8092d65ea6b4c