Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f am: 28c9000b

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



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