Merge "[XTS] running P2P with Wifi disconnect" into udc-dev am: 41d9f455aa

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/23700113

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