Merge "ANR WatchDog += servicemanager" into main am: 657bc29a5d am: 2975d5a007 am: 41123bd83c

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

Change-Id: I7c7ec18f5a021bd023dbd741d228c12914fb79ea
Signed-off-by: Automerger Merge Worker <[email protected]>