Fix automerger conflict am: d890d7ec70 am: 06d39b418e am: fa087abf0a

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

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