Android Mainline 11.0.0 Release 25 (7216135)
Snap for 7213484 from 6496137f7bdf2bb7bcc62feeffb682c5fbc5d451 to mainline-permission-release

Change-Id: I7a515c3d5c87fb1962eb12390f9988d86b6519e3