Merge "Prevent NPE while finishing activity" into rvc-dev am: 1dbee3e34b

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

Change-Id: Ia0f5dfb2c7495c892cb9bfa3da06dd5592994a07