Merge changes from topic "fixSettingsCrash" into udc-dev am: 25ffa22319 am: 8ce16aad2b am: 95f64a10b4

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

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