Merge changes from topic "nfc_workprofile" am: 2740c2f009

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

Change-Id: If86eaccf96acc4b1135b8795ec1b2d86c28fa148