Merge "Resolve NPE when user updates display size" into udc-dev am: f4425cdf3c am: 4a723a18cf am: 26d63daceb am: 1b0164c9db

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

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