Merge "keystore2 support for app UID migration"