Merge "Prevent NPE while finishing activity" into rvc-dev am: 1dbee3e34b am: 3884ae8712 am: 04dfbf4d61

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

Change-Id: Ifb0b7fb4e2aa17e858f2771187412c8d56853441