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

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



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