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

Change-Id: Ib37b8fa31335e1dbaec215bca0771d01b36d19d6