Merge "Merge cherrypicks of [19734281] into rvc-platform-release. am: 0d4f4fce5c" into android11-gsi