[automerger skipped] [automerged blank] Now suppressing ability for a potentially rogue device to engage in 2p: 5bd94084b3 am: 24073a39d2 -s ours

am skip reason: Merged-In I3e28b8882a0741a734422c52057d5ad1e608d8a8 with SHA-1 a547c7001c is already in history

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

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