[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 8e2e5a774f -s ours am: 3969bbdc41 -s ours
am: ac5a6d8491 -s ours
am skip reason: change_id I963225854cfc4a202d9b9829373a3de7e47d96a7 with SHA1 ed6274e426 is in history

Change-Id: I9ba342198993a38624f915e8842fdea32ca814ce