[automerger skipped] Merge "Separate callbacks for dismiss start and end" into...

[automerger skipped] Merge "Separate callbacks for dismiss start and end" into tm-dev am: 94fdf404 am: d245fbde -s ours

am skip reason: Merged-In I1ab46134b994cebff606345af62bf70f79a92e3f with SHA-1 f0cd5dd1 is already in history

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

Change-Id: I0c83e05c7a5fc423ebbbfec88bee91855eec0f81