[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 2bfb91e57b -s ours
am skip reason: change_id Icd401ad4d25c9a48e3befba9d6aae66cc5f67785 with SHA1 244dc17f49 is in history

Change-Id: I61e776f81150778f13e7c149a1c7979c34522a22