[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 9f7476ad4c -s ours
am skip reason: change_id Ib11313bef8f129e109d11e656b29c9b753137265 with SHA1 25353557c1 is in history

Change-Id: I7eed80e417dbce9c3890c8781684cab6d5ac6b88