Merge "Notify onFinished when activity is destroyed." into sc-dev am: d78977a7aa

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

Change-Id: I5cbb8b192dcfe361f6b736e606841e6ddf5dfa56