[automerger skipped] Merge "Migrate system/core/adb to packages/modules/adb" am: 7bc92050e3 am: 7f4a3daee5 -s ours am: 7f3688598a -s ours am: a4fc503b41 -s ours am: ef4e02438c -s ours

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

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

Change-Id: Id9050d31a0e6a0ebbe7908d27a3d86eac603512f