Merge "Notify onFinished when activity is destroyed." into sc-dev am: d78977a7 am: c5c8dff9 am: 21b06eb9

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

Change-Id: I5bf6b680a38dc37cb2c147fcfd2b9f12821fd324