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

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

Change-Id: I0acaa2a79f633dd39de6bcb59f7cd3c084f20875