Merge "Fix std::unique_ptr error with incomplete CommonFeatureGroup" into aosp-main-future