Merge "Update Keystore with new fields for API V3" am: bf7a5eaf9e am: 57b88eef3b am: 7b82832fde

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

Change-Id: I8676ae35dc3c9a2a8be0d27b690821a50d58b980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>