[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: de1b4be0c4 -s ours
am: 8081ebca4f -s ours
am skip reason: change_id I67e45067cbd831b3a64e6a41b3553de9cbcbc192 with SHA1 a71181c20f is in history

Change-Id: I55d1a24f5c8057caf91bba39ba62a1efbb00d540