[automerger skipped] Merge "Migrate system/core/adb to packages/modules/adb" am: 7bc92050e3 am: 7f4a3daee5 -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: I370bb64af4ce8ed3bd8fcb1b72913f8a590bde26