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

No content change.

Bug: 135460123
Change-Id: I9f7a8d2543c671439b7bc53af638716ebbd060c0
Merged-In: I96bc50d90bef5cbe55acbb773436fe21129e25ab