Merge "Fix testRelaunchConfigurationChangedWhileBecomingVisible flakiness" into sc-v2-dev am: bebfe77990

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

Change-Id: Ia00d63d4383e4b50f57ef71ce43b23a7c451f549