[automerger skipped] Merge "Add Instant hotspot preference" into udc-qpr-dev...

[automerger skipped] Merge "Add Instant hotspot preference" into udc-qpr-dev am: 67d5cb42 am: eafc4034 -s ours

am skip reason: Merged-In I343599e6127d9b1cb4af661dcc80a8683589c7b8 with SHA-1 63321a1a is already in history

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



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