Merge "Fix nfc owners location" into main am: b1e5159fcb am: 07200c341c

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3489773

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