Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b17 am: afc2de47 am: c85f627e am: 6601ffb4 am: 6b5262af am: 3a7eecf3 am: c1604f69 am: 7e0fe9f9

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



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