[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: ed56d56f58 -s ours
am: 7d45a3ff9a -s ours
am skip reason: change_id I7ac6c92e1b64ccf5860de04b17a448046e1af8fe with SHA1 be2c54c3e4 is in history

Change-Id: I8866ffef6a7434b10bd019e2faa3fd3949808f9f