Merge "Reorder code so we can use different displays on the preview render"...

Merge "Reorder code so we can use different displays on the preview render" into udc-qpr-dev am: b054f79c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24335185



Change-Id: I9f0be5d0bb15b71d7209627d814f02610a18b670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>