aml_per_341410020
Snap for 10453563 from cc6af6925e49b0eec754ebfd72eacab2b3dbcab8 to mainline-permission-release

Change-Id: I25bd2cd1348f609ee91943aa3b58653527481f14