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

Change-Id: Ibdaeaad09254a8dfd8aeecf41518d253db99c9c3