Merge "Cleanup hsum_unlock_notification_fix" into main am: ce1f73981b

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

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