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

Change-Id: I5440b8f1a6f1494bfeb84241d73027428f41b572