Merge changes from topics "High FRR - notification", "revert-24295111-High FRR...

Merge changes from topics "High FRR - notification", "revert-24295111-High FRR - notification-JTFUNRYWXL" into udc-qpr-dev am: b20dbb50 am: 40b48f76

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



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