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

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

Change-Id: Ie8a7dd3cf1d525e22f430beaea95e85c7fc62ce9