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

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

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