[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 639e0bdf4f -s ours
am skip reason: change_id I12c299b18f26a6135dc8573693318679f443b5df with SHA1 78bc12304a is in history

Change-Id: I06f86bfdd4a75f08f93bf69f95a5e27ba568c504