Merge changes from topic "fixSettingsCrash" into udc-dev am: 25ffa22319

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22967537

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