Merge "Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7 am: c570eb8c am: f2c65caa" into rvc-qpr-dev-plus-aosp am: 496f19f0

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

Change-Id: I666eb704531e156c211ae0e9ccdafe09d598aefb