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

Bug: 135460123
Change-Id: I438f9d7dcb3e94b24670a2352baa3a1bfd5e4024
Merged-In: Ia7f8c4578dc1ba649b52cb76e0aa131c46d69c6f