Merge "HSUM: Fix profile unlock notification" into main am: 091e02579b am: 9f78862722

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

Change-Id: I42348407252eec8be9068525ad2952cbaf613fb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>