Merge "[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d57e959e71 -s ours am: 9b2f502e0a -s ours
am: 97a5254ecc -s ours
am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2dc is in history

Change-Id: I118ff30ef1a88f27bf803276f1cba245bc6ccbc6