[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: 6b2e98fdb1 -s ours am: 8d37dd1acb -s ours
am: 86caffcc7a -s ours
am skip reason: change_id I6ad0c778bc41072fe1f411ba45a4cddb635c91cc with SHA1 2e2b1e7c1e is in history

Change-Id: I342ebd404da08c8d24f5b0f71e9c40a84d163205