[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 162c7f41a9 -s ours am: d85cf16fa4 -s ours
am: b096404fca -s ours
am skip reason: change_id I8916b664519a85b79710ba430738a505c25a28e0 with SHA1 8a10f7dbce is in history

Change-Id: I19b36edd007b45d172edb1f3bf26f888eda4f132