[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 skip reason: change_id I971ea1db5b37fca8a651cba85ba12c44d13e07c1 with SHA1 979aed6d01 is in history

Change-Id: I58d67a5395720ba6077072c33972835ebc9a1285