Snap for 8736029 from 94ebbc1cbb3ea57fc136f38cce64cc3e6b372b06 to mainline-go-permission-release

Change-Id: I8a16bb3ec0d3193eaf1feac9556638ea99deb22d