Merge "Crash invalid FGS notifications" into rvc-qpr-dev am: e91ae52a85 am: 67d1edb349 am: 33a1ce86ec am: 3953a6a498

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

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