[automerger skipped] Merge "Avoid ANR when UI query network selection state"...

[automerger skipped] Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095 am: 782bb2f0 -s ours

am skip reason: Merged-In I81a597f28cf7ce25ff4eff5100bdb4d29c897a14 with SHA-1 7b9c2234 is already in history

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



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