[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: cc35cdd3b4 -s ours am: 635d5f44fd -s ours
am: 3beda6bd12 -s ours
am skip reason: change_id Ide45d9cbe2c437c140f6a756c8b9b04f13ec7a07 with SHA1 3b87006375 is in history

Change-Id: I97acf75d45acda41b78f491a4fb6f058a0de3e07