Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am: c410b053b9 am: d8fb75701d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77346383545bd79d9406b5711f969e07eb1e66f0
tree: b56782504aaf2c75d0b9188496d2149624d204dc
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS