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: 20c3a8ea

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



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