[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 3ee74659ab -s ours
am: 95c3139bbe -s ours
am skip reason: change_id I9c84a0c1f8be7e5e24702cfafb773b3bbf97ceb3 with SHA1 607711c60d is in history

Change-Id: Ie7c42e9c6aca53906e43331a4aa04b6a971e9512