Snap for 8564071 from 0899a09b09a65f576a372db1c50c2f3c0bd36aa0 to mainline-permission-release

Change-Id: I541c072cf326a0c8863297a7e059d3c14f99ba7f