[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: cfaf477e -s ours
am: f52a3a79 -s ours
am skip reason: change_id I971ea1db5b37fca8a651cba85ba12c44d13e07c1 with SHA1 979aed6d is in history
Change-Id: I0dd5a8de8da98c1f1a6cc164499508be4b6d3cde