[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 6defbe27c0 -s ours am: 9abeca4cbc am: 58ea4dbe4e am: b5e90434c7 -s ours

am skip reason: subject contains skip directive

Change-Id: I8e3e2832b85cc16c68a6bb4f4a56931bcbffbdc6