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

am skip reason: subject contains skip directive

Change-Id: Ia08f2679a7ba0586e20d6b7db7496e5cf45b181a