[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: fdb43e49e9 -s ours am: f9030a12e5 -s ours
am: e153774a5e -s ours
am skip reason: change_id I971ea1db5b37fca8a651cba85ba12c44d13e07c1 with SHA1 979aed6d01 is in history

Change-Id: I6cfe24b8be5fbab556e8a725ed5394a53878ea2e