Merge "Fix managedProfileUnlock_stopped" am: 464c768ddf

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1908992

Change-Id: If48a047827d3f5e0ee6d1e20f06fb0114669d6a9