[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: e79a2d9093 -s ours am: adaa5c2408 am: f7af0172ba

Change-Id: I801d27e70e9dfe7c683f36afa2564a0158f91264
tree: 61762294761d73e0a7cba6963dae7f534d55fb80
  1. amber/