[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b7886e91ee -s ours
am: 805d52c6e8 -s ours
am skip reason: change_id I546c6b154289a305c58a3113bde79c777c811320 with SHA1 067af3f59f is in history

Change-Id: Ibc4a85d94b7c678dda0e33b5af3cdef914196cf1