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 am: 4bf3a373

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



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