Merge "Add a flag to enable watchdog for the NFC system process" into main am: db82667e

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



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