[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: c96a461f44 -s ours am: 5cfeebde5c -s ours
am: 42347d06d2 -s ours
am skip reason: change_id Ibf179a62668a4bff6d28a125cfb84a4c7c5fceb3 with SHA1 018b39295e is in history

Change-Id: I82c34de658f017797ce09d1c038ac570ad20984d