Merge changes from topic "AVB2-CF" into sc-gsi-dev am: 7f5f83d6f1 am: 438642ea91 am: fd83c8c903

Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish_prebuilts/+/16087081

Change-Id: I12442152ff1b73bfd5955903218da08c791dfb79