Merge "Merge cherrypicks of [19418348] into rvc-platform-release. am: dd4125beeb" into android11-gsi