Merge "Rename service android.security.keystore2 to android.system.keystore2."