[automerger skipped] Fix BUILD_ID after T merge. am: 480b2a5f6e -s ours am: b0f5c4cb6c -s ours

am skip reason: Merged-In I4e4b6a02fc140a1e38ce533031d7eb0a739396df with SHA-1 05442a9213 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19127225

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