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

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

Change-Id: Id36d3ce48a39d40f714ef5131b4cee4644d1a590