Merge "Make p2p start searching after turning off airplane mode." am: adb5c502 am: 42552147

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



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