Snap for 8817865 from 9ff356c518a728fa3cc80b79224c3988b24bea3a to mainline-go-permission-release

Change-Id: I2dada901c0cdbd2314f4e07a10575f8e56d15584