[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 51fcedb0e9 -s ours
am skip reason: change_id I8a200386bb14368e18a2a28c74e9c88cc91e0286 with SHA1 05496fb796 is in history

Change-Id: If51941c7b04e187401d8f5f8683190517d78da06