Merge "Adding a test to list aliases of large number of Keystore entries with long aliases."