[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 11d99f5276 -s ours am: 57f5e9b0fa am: abcb329789

Change-Id: I889c9ce259b2f2d3797d3238d129f35a3e19dd4b