Merge "Revert^2 "Address frozen notification API feedback"" into main am: 1c68f8cc1b am: 8b7a887581

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

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