[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: ec6dda9d4d -s ours am: f5c09b952a

Change-Id: Ie15636357bfc9868e03a27d0ecd07cbc18385612