Merge "Merge "Prevent FGS notification from exceeding allowed" am: 6ef438e7...

Merge "Merge "Prevent FGS notification from exceeding allowed" am: 6ef438e7 am: 3bf5c290" into tm-dev-plus-aosp am: eeb2d218

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



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