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

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

Change-Id: I611aae09d53d4b81b00f91a0edf08c9c83fa12b8