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

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

Change-Id: I4d864c07103fccbe0f30035daafe8e14278576ac