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

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



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