[automerger skipped] Migrate system/core/adb to packages/modules/adb am:...

[automerger skipped] Migrate system/core/adb to packages/modules/adb am: 4f22d869 -s ours am: 0e129791 -s ours am: 366d64fc -s ours

am skip reason: Change-Id Ia6b4ff799d94a0509f971086e72a60f1f1734e49 with SHA-1 5528e50e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12902387

Change-Id: Iad8b35c56b8c7698bd7401e455883a34beaea8ad