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

Change-Id: I6dcdedacbd6606365688c946e9eb85fa0b8c27b1