Merge "ANR WatchDog += servicemanager" into main am: 657bc29a5d am: 70aff51936 am: 96002e9ca8

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

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