Snap for 10453563 from e7a2c2628cfe6bd7de827397d1ba2596f9f98014 to mainline-permission-release

Change-Id: I73f4dc1597b958473b6407c73eff8a69fed86568