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

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



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