Merge "Resolve NPE when user updates display size" into udc-dev am: f4425cdf3c am: 4a723a18cf am: 80b9eece91 am: e0b1ec02ce

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

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