Merge "Use clang-r407598" am: 5cd28fa6be

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I802c0978450c173c8e48160acabd80b509251308