Merge "Upgrade the default clang version" into main am: 494b6e05f5

Original change: https://android-review.googlesource.com/c/platform/development/+/2974020

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