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

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

Change-Id: Ibd1218665f7e8e6be1648ea3ba90468335bc73a2