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

Change-Id: I4ad35d43db35ccacc592fea44d0683c6f3ecc162