Merge "Don't set the build id if we need to append the digest" am: a530481db1

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

Change-Id: Ib5b71b351184bfc1cbbeb0c60e4a46f368c95b1c