Merge "Ensure ActivityManagerInternal instance is non-null" am: 985723a5f5 am: 045ed333d4 am: b9dd1f4eb6 am: 3ae3e74882 am: afff99592e am: 0f55f6a555

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

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