Merge "Framework support for AndroidKeyStore migration"