Merge commit 'b1b958019585a164645cada7ff1fee7875d20c97' of sso://googleplex-android/platform/packages/modules/Permission into HEAD
Change-Id: I962dea7f5b635c4f16313c34d359647ae64b64de