Snap for 10453563 from 34e7e11ec02e65d0dd78bfe89c5de2c769a5be2b to mainline-permission-release Change-Id: I4be61a22e299c972fcda5bdde719fe8343273686