Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
No content change. Bug: 135460123 Change-Id: Id5c0fc0c6138cd09b46e5029dfeff1fc3f54753a Merged-In: I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16main
commit
309cb0811a
No content change. Bug: 135460123 Change-Id: Id5c0fc0c6138cd09b46e5029dfeff1fc3f54753a Merged-In: I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16main