Merge "Ensure wm is fetched on the shell thread" into sc-qpr1-dev am: 938b7d01f5

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

Change-Id: I5c5c6f45eeab257d8cc17b1e9321fa51f4893132