Merge "Keystore 2.0: Add keystore2 to llkd ignore list." am: 8a8bde07f5 am: 12d6fefb41 am: b45e82e966

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1636239

Change-Id: I6387c5bd0ea996e5ea91cddf81324f18cb8ed0f9