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

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

Change-Id: I1ea6a1f50e137426b2a1ee32f8b481f5c3c75350