Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b17 am:...

Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b17 am: afc2de47 am: c85f627e am: 005285a1 am: e6b1e10c am: 2bdaacec am: 7c38017d am: bb41c14a am: b399239b

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



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