Merge "Resolve NPE when user updates display size" into udc-dev am: f4425cdf3c am: d66c6ead6c am: 462a40e252

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

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