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

am skip reason: subject contains skip directive

Change-Id: I8f965eab846507a94aa5f51ea22667506af2e0c7
tree: d9cd353f97f44148529a04676a1eb3e051540480
  1. android-5.4/