Merge "Rename closeDialog to cleanupSession" am: 0a99b6c48b am: 0eaa96b4e7 am: 6523cf73cb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670485

Change-Id: Ibf58445e83e76ee13980ecd89d7919de676fd710