[automerger skipped] Backup NETWORK_AVOID_BAD_WIFI setting. am: c0e7e416 -s...

[automerger skipped] Backup NETWORK_AVOID_BAD_WIFI setting. am: c0e7e416 -s ours am: feb84b6f -s ours am: cb3f184b -s ours

am skip reason: Merged-In I1e0f41443bb12b7687e21e8b426c95b1a33b3fd9 with SHA-1 a05d73f3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22069845



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