Merge "Improve test flakiness around FGS notifications" into sc-dev am: 86ed597d am: 44fcdcf6 am: dd69f8aa

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

Change-Id: Ifef4bbef32a5778fb890f1091bcc8d615322d4cb