Merge "Crash invalid FGS notifications" into rvc-qpr-dev am: e91ae52a am: 67d1edb3

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



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