Merge "Merge cherrypicks of [20078165] into rvc-platform-release. am: 4ea5e82c30" into android11-gsi