[automerger skipped] Merge "Cleanup hsum_unlock_notification_fix" into main am: ce1f73981b am: 54ab50c263 -s ours

am skip reason: Merged-In I63b22423427cb98ea2a5a1f96b246ef328be5e63 with SHA-1 1a9d891704 is already in history

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

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