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

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

Change-Id: Ie82fa8ce1920da88af0ca8772fce9fb7da4cdbc5