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

Bug: 135460123
Change-Id: I556930a53020ba2fadc76fb94fd73af7f0d53a43
Merged-In: Ib2980eb2298cc867635c9ed24350245235f06b9e