Merge "Keystore 2.0: Make Bluetooth app ready for Keystore 2.0 part 2."

package com.android.bluetooth.btservice.bluetoothkeystore;

import android.annotation.Nullable;

import android.os.Process;

import android.os.SystemProperties;

import android.security.keystore.KeyGenParameterSpec;

import android.security.keystore.KeyProperties;

                        .setBlockModes(KeyProperties.BLOCK_MODE_GCM)

                        .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)

                        .setKeySize(KEY_LENGTH)

                        .setUid(Process.BLUETOOTH_UID)

                        .build();

                keyGenerator.init(keyGenParameterSpec);