Merge "Improve test flakiness around FGS notifications" into sc-dev am: 86ed597d am: 51fdd148 am: 3dfe2921

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

Change-Id: I58a48c9f4d90e3315d7810a4b81da90044f87e71