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

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

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