Merge "Notify onFinished when activity is destroyed." into sc-dev am: d78977a7 am: 192818d7 am: 4a1a4dd6

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

Change-Id: I5d632d5d80a579bda16aae3c89c8b48de5664776