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

Change-Id: I8396f66e29fb97afd76480ede24c4bb16abff584