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

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

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



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