Merge "Use clang-r407598b" am: 62c54c1652 am: 03a1b4b967

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib13ea90dd97e18853c7020f4765e37cc3b0cf8e5