Merge "Make recovery/fastbootd USB VID/PID configurable." am: 512edf4a am:...

Merge "Make recovery/fastbootd USB VID/PID configurable." am: 512edf4a am: fa1855a5 am: 3052ef7d am: 2c0ea9f0 am: 74455ea5

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



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