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: de66f395 am: ae7bf8fc

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



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