Merge "ANR WatchDog += artd." into main am: 1335a83293

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

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