Merge "Deleted clang property in Android.bp files" am: 6f979417ec am: 8274b1299b am: e2204c1aaa am: eb64bd19e0 am: d186585c0d

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2065991

Change-Id: I0befa1b9700a23334c4287ac36aa63d2c7d1be7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>