[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 9411ddddb9 -s ours
am: 57516d5028 -s ours
am skip reason: change_id I1582e1bec08f68ef086f10d9e78c8355b0408cd7 with SHA1 a7ed3f9fc8 is in history

Change-Id: I6f59d267cfab833b09ac930b02b3f2379a9dd784