[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: bb859581ca -s ours
am skip reason: change_id Idd1c83dc46f167f4b79092803539c3dd37a88ca3 with SHA1 0faddf9d97 is in history

Change-Id: I1c98918a0b53b5a55fc1bfa2789841cfa0378b43