Merge "Use clang-r407598" am: 5cd28fa6be am: ec5105796c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie166e9422daace51658b0fbba37a73b5679414d1