Merge "Convert hardware/interfaces/keymaster/3.0/default/Android.mk to...

Merge "Convert hardware/interfaces/keymaster/3.0/default/Android.mk to Android.bp" into main am: ab18a3b5 am: ad6f0eab

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3135574



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