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

am skip reason: subject contains skip directive

Change-Id: I04eb0bc6a95507123c55927b80ac32fd179332fd