[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 -s ours

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

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

Change-Id: If14a3a115698e5377b7c985f90ddf676c60b30e6