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

am skip reason: subject contains skip directive

Change-Id: Ie34e2fb50658d25d2c6a7e167cef29ffdfb73f68