[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 05ff4e26d9 -s ours
am: e72851a196 -s ours
am skip reason: change_id I93faa55bf6fca544876d970d058f8aa5c5462f3c with SHA1 555d150aee is in history

Change-Id: I36885a04c5350b9835ecd79d99b14e374fbedbd8