[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 2ddd0fcff0 -s ours am: 868acf3ead -s ours
am: 6be6d32a1e -s ours
am skip reason: change_id I3d98bd70a659cad37d520fb0e7ecd631f622e8fb with SHA1 e56141599a is in history

Change-Id: I1d5aed1bba431562bfeb76b8113595b68d43f97c