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

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