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

Merge "Crash invalid FGS notifications" into rvc-qpr-dev am: e91ae52a am: 67d1edb3 am: 33a1ce86 am: 3953a6a4 am: 44ffcf54 am: 5c623433 am: 5eeb26cb

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



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