Android 11.0.0 release 25
Snap for 6650198 from bcd32a995022bee36bcd26f636ec04d3c23aa5ac to rvc-release

Change-Id: Ib9f0f2c4698dd56d79698f0797627f6d077b0c9c