aml_per_331710050
Snap for 9640974 from d73b4aa2f9782e8151d31593576592d8da0da570 to mainline-permission-release

Change-Id: I11dc96a75cffc93767cff8f82c734ccc5247b90b