Merge "Add keymint_use_latest_hal_aidl_java" into main