Merge "Update to clang-r498229b" into main am: c55eea75d2

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

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