Merge "Revert "Convert security/Android.mk to Android.bp"" am: 86210ee96c am: f5307b4d30

Original change: https://android-review.googlesource.com/c/platform/cts/+/1896453

Change-Id: Ic86bbaf5d200630e97e9c6c1bf8dc18deaac2e48