Android mainline 12.0.0 release 93
Snap for 7547121 from c2d8370656ab17db24cd5f9b969210487e0b4324 to mainline-permission-release

Change-Id: I3019d55fc40a78cb5cfa21c7a01ff71dd0ee57b6