Snap for 11413222 from 74708d74ace00b83e25c16805a47eebbdc54ff3d to mainline-permission-release

Change-Id: I48e535d40290a20694145439081e8a12b3c45c50