Merge "NIAP: Ignore BluetoothKeystoreServiceTest when the User is not primary."