Merge "Fix potential NPE when ActivityClientRecord is null" am: f47829a8eb am: a96babb6fa am: 73a9385100

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

Change-Id: If60c3495b8f614cecc0dc471e5649e12e43a0d8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>