Merge "Fix compat change CTS test flakiness" am: bb0db1d243

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

Change-Id: I0b32b7631d7f9ceade3e170d53ba068db924e85f