[automerger skipped] Merge "[cc/pgo] Mark pgo.sampling property as an...

[automerger skipped] Merge "[cc/pgo] Mark pgo.sampling property as an arch-variant" am: 79c4bdb3 am: f851acaf -s ours am: d34628f2 -s ours

am skip reason: Merged-In Ib6ddca6685c2e53092afd440ad95ec42d3a9538b with SHA-1 19a5aae3 is already in history

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

Change-Id: I9c55761cfa2773448a578fa9ba5e6122f73c2f2c