[automerger skipped] Merge "Avoid Unparcelling AttributionSource in WifiP2p handler thread" into tm-dev am: 6ae63f2547 am: 5c542e69f1 -s ours

am skip reason: Merged-In I985a4bcf9036dab78d2595759b1c6fa2a80518b0 with SHA-1 1d21fac8c0 is already in history

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

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