
Until now, if the permission somehow already existed, it will add
it another time.
This change ensures that it only adds the permission once.
Also, this change adds a minor reformat to the other test.
Change-Id: If68f0def0fe042b1a3f669b7118e8138aa29e7fb
(cherry picked from commit 5164b2cb5a
)