Merge "Merge "Crash invalid FGS notifications" into sc-dev am: bf79a4c4 am: d78962eb" into sc-v2-dev-plus-aosp am: 93c30ae3

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

Change-Id: I6850313c6d53264066a7a9c977e6182fc3252661