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