[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 41286a86d6 -s ours
am: a70b5e8521 -s ours
am skip reason: change_id Id112025ccf9343c809149f5b93c886af5508f5d9 with SHA1 3cab2d8403 is in history

Change-Id: I78a6b79f8648a4e05c5f9dfb9b18b3967e466458