Merge "Fix flickers on the Location page" into tm-dev am: a8eabc6a

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



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