Adjust tests for newly-exposed Grant functionality

Test: keystore2_client_tests
Test: keystore2_test
Bug: 374411756
Bug: 351899088
Change-Id: I99f2ad0d5a677db9c65ff30326608f930c049245
2 files changed