[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: a4ef68f4b4 -s ours
am skip reason: change_id Id604105761e5156d67182cf757dee611bcb5f935 with SHA1 83d9cd00f3 is in history

Change-Id: I7bfa15782e57fcda5b3a887c81401a3769a3067d