am 6ce1983a: Merge change 4532 into donut
am 6ce1983a: Merge change 4532 into donut

Merge commit '6ce1983a2b5e9f5e735ac09b270b400084edb7db'

* commit '6ce1983a2b5e9f5e735ac09b270b400084edb7db':
  Fixes #1924909. When restoring managed dialogs, do exactly the same thing as when showing a dialog.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base