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

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

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