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 am: 826ab351 am: a96d05b6

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



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