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

[automerger skipped] Update the p2p device interface name am: 6adbab13 am: b828beb0 -s ours am: 26c534b8 -s ours

am skip reason: Merged-In I522cec02a662c057e21d434f3ed98c7e7a4ca8f0 with SHA-1 6adbab13 is already in history

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

Change-Id: I39391b9d201d7b0c4c489979a9462631960a0e01