Merge "Support the dump of nfc service in incident reports." am: 01cce002bf

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1620652

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I115c6fc915745489117f6594f3fe48c918ce2d26