[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 3826203ca6 -s ours
am: f522dd14c9 -s ours
am skip reason: change_id I5f3596d149f2f4319f780b43f38a1967a6ca2f51 with SHA1 2e4ef0bce9 is in history

Change-Id: I83711bb837b18438e42d6f76986a9a6d8772b4a5