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

Merge commit '0a0225418366e4502e18e414e71a04d575b1a47e'

* commit '0a0225418366e4502e18e414e71a04d575b1a47e':
  b/2320107 NPE when receiving a Undock event without a device