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

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

Change-Id: I6f4dec56c0bccbbda0d2a58d18cb20190ab29917