Merge "Making Process.NFC_UID SystemApi for modules" am: 06580338e6 am: d086e8ee72

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

Change-Id: I8adadb76c51aa37665ac9847c51e852bd7d933b8