Merge "Switch to HexEncoding from ByteStringUtils" am: efbd81e1

import android.os.SystemProperties;

import android.os.UserManager;

import android.test.mock.MockContentResolver;

import android.util.ByteStringUtils;

import android.util.Log;

import androidx.test.InstrumentationRegistry;

import com.android.bluetooth.TestUtils;

import com.android.bluetooth.Utils;

import libcore.util.HexEncoding;

import org.junit.After;

import org.junit.Assert;

import org.junit.Before;

            Log.e(TAG, "Salt256Bit is null: " + metricsSection.toString());

            return null;

        }

        byte[] metricsSalt = ByteStringUtils.fromHexToByteArray(saltString);

        byte[] metricsSalt = HexEncoding.decode(saltString, false /* allowSingleChar */);

        if (metricsSalt.length != 32) {

            Log.e(TAG, "Salt length is not 32 bit, but is " + metricsSalt.length);

            return null;