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

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



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