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

Change-Id: Ifd3bfd99d0629b69489bafd0c91b06227e5bebb7