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

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

Change-Id: I563b92512f366ee90d3227061901e3b9d1a427f8