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

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

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