am 17fe99ac: Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-dev
automerge: bec816a

* commit 'bec816adc7dbbc23a04156e2aefeec9d0cb92077':
  Fix NPE in DropBoxManagerService.dump()