Skip grant dialog when permission are granted

This is a 1:1 resubmission of I4a7baa8f8d2bb62f8a6e8fa601039056757261e1.
The fixes will be submitted on top of that.

Test: Granted verious permissions sets via UI while also granting some of the
      permissions via the shell

Change-Id: Idd87afe78af5abf63b9a361a2dce4c99052b3e4d