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: 6601ffb4 am: 6b5262af am: f81caab0 am: 0de60579

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



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