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 am: 27c4b3b6

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



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