Merge "[8/n] FRR notification counter update" into udc-qpr-dev am: 9a619fccbf am: f372b94fa7

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

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