Merge "Use clang-r412851" am: db1507471c am: 2b59657cbe am: b4c4fb9b81

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

Change-Id: Ie3e561dcac60af6dc9f24843ffbe0ee58e0ec4bc