Merge "Merge cherrypicks of [18766116] into rvc-platform-release. am: 542283a1b5" into android11-gsi