am 3a6b2df2: am 324ab848: Merge "b/2370089 Pop the dock dialog above the keyguard" into eclair

Merge commit '3a6b2df23950cd64c10dfbb437aa56a99cbce54a'

* commit '3a6b2df23950cd64c10dfbb437aa56a99cbce54a':
  b/2370089 Pop the dock dialog above the keyguard