Merge "frameworks/nfc: Correct NFC non-updatable owners" into main am: c7556248 am: 66155284

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



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