Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09d am: 03b39bc5

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



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