Merge "Remove wtautological warnings added during toolchain update" into main...

Merge "Remove wtautological warnings added during toolchain update" into main am: 6edbaa36 am: 88ce10f6

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



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