Merge "Enable different interface for fastboot for cf" am: 46a3704702 am: 65700df1fe

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

Change-Id: Ie8f7bf46b43dd79830b75a5864860cb360c5b221