Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f am: 9f831a60 am: c57d3de7

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



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