Merge "Revert "Don't defer FGS notification if it's already shown"" into sc-dev am: a580918f am: 730a24d1

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

Change-Id: Id02781223c2c9a1002d6f282433f238c65732350