Android Platform 11.0.0 Release 39 (RPM1.220718.057)
Merge cherrypicks of [15718931, 15718932, 16248754] into rvc-platform-release.

Change-Id: I6fad66b7c824cc1727e3152b9eca8ee58b10f754