am 6508fe1b: (-s ours) am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '6508fe1b07ec888012255e3a2438382b45a9707f':
  Fix NPE in when dropping from all apps (issue 12917451)
  update placeholder on package install or restore