Merge changes from topic "fixSettingsCrash" into udc-dev am: 25ffa223 am: 8ce16aad

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



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