Merge "Remove functionality to migrate keys across app UID" am: 1713e4867d

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2016380

Change-Id: If6a3028f5c8270915a622a6fb2b1eda6986a35ec