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

Change-Id: I189201fd52dcb238b2de32dbc1809d034c3d6284