Merge "ANR WatchDog += servicemanager" into main am: 657bc29a5d

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

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