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

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

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