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

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



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