[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 5d817c375c -s ours
am: 5c70b528a8 -s ours
am skip reason: change_id Ie996b2d08db31d95cb4bafbe06f22d5a791a9cbb with SHA1 05e52b4c99 is in history

Change-Id: Ibe3fe3b9f809aac9cdac8c9f4729e51ccde2edc3