Merge "Update clang version to clang-r498229" into main am: 7533fc701a am: 4ff1b85a22

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

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