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

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

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