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

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