Merge "Fix settings crash" into udc-dev am: 20c5853744 am: 218310af06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650756 Change-Id: I9529060acc048ff4335caaf3f8f91c1f187b3dbc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: