[automerger skipped] Merge "Keystore 2.0: Enable keystore2 by default" am: 306a6d1f am: a722803e -s ours

am skip reason: skip tag Change-Id Id9f39dc5189b7eda4617328c41a4ac4d4e3af578 with SHA-1 74eedd9d is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1626723

Change-Id: Ic2cfb70d1b13e69bc84223eb7b49aa20053ffe36