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

Bug: 135460123
Change-Id: Ibfea730ea29bc73aa9ffda902aedbc6d8fcec89d
Merged-In: I971ea1db5b37fca8a651cba85ba12c44d13e07c1