[automerger skipped] Merge "Backup NETWORK_AVOID_BAD_WIFI setting." into...

[automerger skipped] Merge "Backup NETWORK_AVOID_BAD_WIFI setting." into tm-qpr-dev am: 988a8777 -s ours am: ccb248b5 -s ours am: d5e2510f -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: I8b80e7635be0bbca89487eb0e046f505acaae33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>