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

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

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