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

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

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