[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: c05ccac5cf -s ours
am: 77b96d5491 -s ours
am skip reason: change_id I4568f81fdeda12ce5c3da86133d42f9b7de7a8b0 with SHA1 e84b02b2bf is in history

Change-Id: I7e2539cb1c0751ad8ffb7eb37fead7f1ad3ad091