Merge changes from topic "nfc_workprofile" am: 2740c2f009 am: 3fd3a6579a

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

Change-Id: I940e84e73a065e534e5ace8430b347f71cc016e1