[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 3bf0911e61 -s ours
am skip reason: change_id Ib2980eb2298cc867635c9ed24350245235f06b9e with SHA1 a70e23afd3 is in history

Change-Id: Ibbfae9b3a468a2eb7c817f1c9a576d6359cb41dd