Android Platform 11.0.0 Release 25 (RPM1.220718.017)
Merge cherrypicks of [20217800] into rvc-platform-release.

Change-Id: I0268e0d1333e212dd30633eefabf8d84912e7707