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

Change-Id: I52c50a37cd4224eb5e57283ef461fdc475664001