[automerger skipped] Merge "Migrate system/core/adb to packages/modules/adb"...

[automerger skipped] Merge "Migrate system/core/adb to packages/modules/adb" am: 7bc92050 am: 7f4a3dae -s ours am: 7f368859 -s ours am: a4fc503b -s ours am: ef4e0243 -s ours

am skip reason: Change-Id Ied3afa5d19d814155c5ecbe2363ba544f2ab96b7 with SHA-1 4f22d869 is in history

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

Change-Id: Id9050d31a0e6a0ebbe7908d27a3d86eac603512f