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

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

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