[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: d6eec05e9d -s ours
am skip reason: change_id I6cf6c323b06b1b2f50112d30b162d1530ef816cf with SHA1 b033ece572 is in history

Change-Id: I762ec3fe4bb2eb9498f8c52bfd9899153e3bd057