[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 5536a1ad7f -s ours am: e11e65c0d6 am: 0f4680ce63 am: dd8988b6f4 -s ours

am skip reason: subject contains skip directive

Change-Id: I3999998a6c9d22289232b1cb3625585b3ca57a1d