Merge "Merge cherrypicks of [18168006] into rvc-platform-release. am: 8a7741904c" into android11-gsi