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

Change-Id: Iaff9dc7db632ac1b7600361ed54be39849c5fa01