Merge "Fix compat change CTS test flakiness" am: bb0db1d243 am: 3d1cfa54d6 am: 1fe983edb7 am: 3a5b1a12c5 am: bc74c915c8

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

Change-Id: Ib5ce1e3bf4e69f85c2044093e3ad7a56f2ace240