[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 615cfa6246 -s ours
am: a3a6c8e621 -s ours
am skip reason: change_id I8aed7faa9b713298b8d5227b8823226867e30556 with SHA1 bbd2d8fe4e is in history

Change-Id: Ibd5fdf42a9253025aaffe09483681405ab16710e