Android 11.0.0 release 25
Snap for 6538416 from c7b3d621ada59d4fed7965a11b0a3072470550f9 to rvc-release

Change-Id: I20d4b2c1056557cecd0a5180ce46f5a60fc1d730