Merge "Address frozen notification API feedback" into main am: ed0b94d689

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

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