Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev...

Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev am: a6f2464e am: face5b6c

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



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