[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 2ddd0fcff0 -s ours
am skip reason: change_id I3d98bd70a659cad37d520fb0e7ecd631f622e8fb with SHA1 e56141599a is in history

Change-Id: Ib5d319e0a34f6ade941e4077f702b065fe338d3d