Merge changes from topic "soong-clang-version-fix" am: 39f573eb00 am: 85737b03d0

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

Change-Id: I1f3051c7c94535b967a4a47eea09ad70d2ca4667