Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708 am: c85f627e2b am: 005285a1ae am: e6b1e10c96

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

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