[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 68ed8787e7 -s ours
am skip reason: change_id If67ec7501d6624c60376ef35744dc55efcef7c75 with SHA1 f3d14b938c is in history

Change-Id: I2e1c36d4f6fe72f3baf2bc38098b7faea8ca905a