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

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

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