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: 436ae969 am: f8ea185f am: df176309

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



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