Merge "Fix sub status of LocationSettings" into tm-dev am: edf39d0e

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



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