am 38badc8b: am 9463c2f8: b/2320107 NPE when receiving a Undock event without a device

Merge commit '38badc8ba086febc93a905de91dccefa03cc1aae' into eclair-mr2-plus-aosp

* commit '38badc8ba086febc93a905de91dccefa03cc1aae':
  b/2320107 NPE when receiving a Undock event without a device