Merge changes I67b68a6a,Id19bc319 into main

* changes:
  Add VTS test to check grants are deleted upon grantee user ID uninstall.
  Delete grants to a user ID when it is removed.