Merge "Fix the following issues mentioned in Pixel SBOM review." am: 3fb8d2ba am: 42cfbe4f

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



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