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

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

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