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

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

Change-Id: Id6fecd9f86d6cc643b1c01852637748d3e090229