[automerger skipped] Merge "Only one channel is reserved for WifiP2pSettings"...

[automerger skipped] Merge "Only one channel is reserved for WifiP2pSettings" am: 4444a35b am: 71a123db am: a7efff1d -s ours

am skip reason: Merged-In I999b108bc3e3c22519398a55b503078c1069cef1 with SHA-1 b6c2ed67 is already in history

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



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