[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 7f7e27a3a9 -s ours
am: 1bf04174f3 -s ours
am skip reason: change_id I544182ded73bb332d8b6277c02e854a4bcd9e1a6 with SHA1 613206b537 is in history

Change-Id: I0605abb732c5ba91f86cc419cbcf13c7376ab19f