[automerger skipped] Merge "Keystore 2.0 SPI: Make LockSettingsService...

[automerger skipped] Merge "Keystore 2.0 SPI: Make LockSettingsService tolerate the Keystore 2.0 SPI" am: c954cae5 am: 3875aac0 am: 21752ade -s ours

am skip reason: Change-Id I6e92a08a6b3145891585a134c195c4e29be709b5 with SHA-1 b9e7ae35 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471566

Change-Id: I09c8f8fb2b4280a682e96f0c780e12c61404392a