Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b17 am: afc2de47 am: c85f627e

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



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