Merge "Revert "Address frozen notification API feedback"" into main am: d6c1a23225

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

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