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

Change-Id: I5a020207d94c9dbfe254fd75a1f0c79706ffd41b