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

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

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