Merge "NFC-F support in work profile" am: 8afd7f34f0 am: fc5e4fc100 am: c4b312b53a am: 5c51541f4a

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

Change-Id: Id6d2275667d8884ad36b704e7468dc3a72af4efc