Merge "API for granting/revoking runtime permissions." into pi-dev
am: c8156c6a52

Change-Id: Ied3764b365ce6e59848042fff2efd748bde3d9ca