Merge "Merge cherrypicks of [20084105] into rvc-platform-release. am: 9db28054d2" into android11-gsi