[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 309cb081 -s ours
am: dc59e8ef -s ours
am skip reason: change_id I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16 with SHA1 66fb8087 is in history
Change-Id: I83da0052be33376ba93b76579b8572576f052e55