Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708

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

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