Merge "Merge cherrypicks of [19946225] into rvc-platform-release. am: 25cdbfb251" into android11-gsi