[automerger skipped] Update the p2p device interface name am: 6adbab13 am:...

[automerger skipped] Update the p2p device interface name am: 6adbab13 am: 31902d7b am: 6f958341 -s ours

am skip reason: Merged-In I522cec02a662c057e21d434f3ed98c7e7a4ca8f0 with SHA-1 7f2822af is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16087108

Change-Id: Iec996d3b8fca6045212432c589f65ec5d69329d0