[automerger skipped] Merge "Avoid Unparcelling AttributionSource in WifiP2p handler thread" into tm-qpr-dev am: a6badaf76f am: d57c26c8a5 -s ours

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

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

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