Merge "Fix NetworkOnMainThreadException in KeyStoreTest"