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

Change-Id: I310c7e4c6891bdabb558ac7d340a7c16f1e79693