Merge "Settings: fix unexpected routing selection" into main am: a02b1c3a

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



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