[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: ea528d03 -s ours
am: 93d01604 -s ours
am skip reason: change_id If96423ed9f30515c5ff7bcba69d789ce68eb6ba3 with SHA1 46854541 is in history
Change-Id: I7c1f592566860b2c4952cb972effdce9a304fdea