Merge "Fix for bug 2427961	android.security.tests.SystemKeyStoreTest:testBasicAccess is failing. Fixed issues in test."