[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 277f31e141 -s ours
am: 9eb8dd9805 -s ours
am skip reason: change_id I3642789b90cb5e10145e07f8fc44d7cd688bfad2 with SHA1 cb5c455ed1 is in history

Change-Id: Id0abc395dd402e233e10b7ee8f7417370dd9e7b7