[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: a8c40b91c9 -s ours
am skip reason: change_id I073c92e542bfa3ac9263b8e13e0f9078866a11ba with SHA1 646e87e495 is in history

Change-Id: If4086919064e1e8f1b1062e261b9856707e38fb1