Merge "Address frozen notification API feedback" into main am: ed0b94d6 am: 6be0f861

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



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