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

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

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