Merge "Merge "Prevent NPE while finishing activity" into rvc-dev am: 1dbee3e3 am: b9bd2da6" into rvc-d1-dev-plus-aosp am: fe66cdae

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

Change-Id: Ied4b44a88cffcf213d6abdf5a00ed3b766377d0f