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

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

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