Merge "Make testAddingImmersiveWindow robust when remote inset controller is used." into sc-v2-dev am: 650ee819e6 am: 687d143a49

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/16235789

Change-Id: I631bb1d387bc97c10df4aa1eb8d142abcacd28c2