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