Call setGenerationId inside generateAndLoadKey to simplify the code just a little

Change-Id: Ie4cc656def75449f0129db09496f4717e2473d70
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
1 file changed