[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master
am: ae9378c4dc -s ours
am skip reason: change_id I8a07a2e852b9003de35997cd5d3a7bb340a079db with SHA1 6f92a637bd is in history

Change-Id: I5933a782c32d179aa30b9055edf534a301e9bd57