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

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



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