Merge "[automerger skipped] Merge "Keystore 2.0: Enable by default." am:...

Merge "[automerger skipped] Merge "Keystore 2.0: Enable by default." am: a5e337b0 am: 1941a166 -s ours am: 3e030716 -s ours" into sc-dev am: f773a1e4 -s ours

am skip reason: skip tag Change-Id I13a3db8ca736cceb06e864457046ff9ca641322d with SHA-1 8b15af2a is already in history

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

Change-Id: If59d386a92ea9e925c8cc306e8c45b8f246f33cc