aml_per_330912010
Snap for 8564071 from cbb2e714a2890890991d72b3d8ce86f210c34e5c to mainline-permission-release

Change-Id: I97333be19d4b8ec572ede63939f4cfb82fad15ae