[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: fbfcdaf2a5 -s ours
am skip reason: change_id I67a7040a90c369abf5a0c3e7cf0e16f351addb99 with SHA1 874516b3a8 is in history

Change-Id: I3a95dd033a101043e98776001aa9ab6268bc2c43