Android security 11.0.0 release 57
Merge cherrypicks of [16905018] into security-aosp-rvc-release.

Change-Id: Icc41f882f32f32ed311499c1adf9f196d236d3f0