[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 7dee80aacf -s ours am: dc71887f83 am: 3f3fd5269e am: 6e3ac1c7a7 -s ours

am skip reason: subject contains skip directive

Change-Id: Ic8c04e735932c1c78ae029bf74d52231bd8b5bf6