Merge changes from topic "merge_cc_logtags" into main am: ab47e15d

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



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