[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: c26793c451 -s ours
am skip reason: change_id I5d1305694de7dd89a12b59c61507fcaa7cb41d6a with SHA1 465ba7cca5 is in history

Change-Id: Ib5f58dcbf26dfb65880a16400ee07fe15b39ae57