Revert "Skip grant dialog when permission are granted"
This reverts commit cdf84d3a.
Reason for revert: Bugs 72387749 and 72384027
Bug: 72384027
Bug: 72387749
Test: Just a revert
Change-Id: I2077cc3205c3a71a641ed50219c3c5d8cd449958
(cherry picked from commit 1259f44f)