Merge "Use correct path for soong_build_metrics.pb when dist is enabled" into...

Merge "Use correct path for soong_build_metrics.pb when dist is enabled" into main am: 2650f35f am: 5ed2c540

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



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