Merge "nfc(frameworks): Consolidate NFC/SE owners file" am: a3f48da0 am: 74fb5d67

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



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