Merge "Fix race condition on size compat UI" into sc-qpr1-dev am: f9c3101d

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

Change-Id: Icf6c77c284a383748f8bdc0c66bb306b2937d3a3