[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 2897464b24 -s ours
am skip reason: change_id Ief4b64d793b60ab00f57b31f3a80ae388227f7a2 with SHA1 beccdb39c2 is in history

Change-Id: I17c36c5619609cbc67a01b6a302a1e74e7a810c4